Check for child->parent instead of GTK_WIDGET_TOPLEVEL.

2008-11-07  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkcontainer.c (gtk_container_buildable_add_child):
    Check for child->parent instead of GTK_WIDGET_TOPLEVEL.

svn path=/trunk/; revision=21771

diff --git a/ChangeLog b/ChangeLog
index 783a9201119f028ac4f4ea6f2c5c15ac83c286e7..3a63380428a78cefa2ef23998131b2196d68c9ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-07  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gtk/gtkcontainer.c (gtk_container_buildable_add_child):
+       Check for child->parent instead of GTK_WIDGET_TOPLEVEL.
+
 2008-11-07  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkscrollbar.c: remove bogus newlines in the middle of

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 30eb06ff2bab4bbcb79d3a9cbf3e8418b4cd6a71..516773af01aa8e10198ffb7e89091d2147ab7443 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -311,7 +311,7 @@ gtk_container_buildable_add_child (GtkBuildable  *buildable,
     {
       GTK_BUILDER_WARN_INVALID_CHILD_TYPE (buildable, type);
     }
-  else if (GTK_IS_WIDGET (child) && GTK_WIDGET_TOPLEVEL (child) == FALSE)
+  else if (GTK_IS_WIDGET (child) && GTK_WIDGET (child)->parent == NULL)
     {
       gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
     }